From ae3aeb7102779d0480edee6a777a12a21bd15c5a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 6 Nov 2020 12:53:50 +0000 Subject: [PATCH] Drop patch for gtk-doc 1.33, applied upstream --- debian/patches/Require-gtk-doc-1.33.patch | 25 ----------------------- debian/patches/series | 1 - 2 files changed, 26 deletions(-) delete mode 100644 debian/patches/Require-gtk-doc-1.33.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/Require-gtk-doc-1.33.patch b/debian/patches/Require-gtk-doc-1.33.patch deleted file mode 100644 index 9c5565d704..0000000000 --- a/debian/patches/Require-gtk-doc-1.33.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Matthias Clasen -Date: Thu, 1 Oct 2020 15:08:50 -0400 -Subject: Require gtk-doc 1.33 - -We'll hopefully get a gtk-doc release out with that -version number soon. - -Origin: upstream, 3.99.3, commit:ffb51b6888f9b199f31434cfeca89203130471c7 ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 127671a..fa39070 100644 ---- a/meson.build -+++ b/meson.build -@@ -383,7 +383,7 @@ graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, - fallback: ['graphene', 'graphene_dep']) - iso_codes_dep = dependency('iso-codes', required: false) - --gtk_doc_dep = dependency('gtk-doc', version: '>=1.99', -+gtk_doc_dep = dependency('gtk-doc', version: '>=1.33', - fallback: ['gtk-doc', 'dummy_dep'], - default_options: ['tests=false', 'yelp_manual=false'], - required: get_option('gtk_doc')) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b496eced3c..0000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -Require-gtk-doc-1.33.patch -- 2.30.2